diff --git a/.gitignore b/.gitignore
index 2e32ae7..bb460e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,121 +1,7 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## User settings
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
 xcuserdata/
-
-## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
-*.xcscmblueprint
-*.xccheckout
-
-## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
-build/
 DerivedData/
-*.moved-aside
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-
-## Obj-C/Swift specific
-*.hmap
-
-## App packaging
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-# *.xcodeproj
-#
-# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
-# hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
-
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# Accio dependency management
-Dependencies/
-.accio/
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
-
-# MacOS
-#
-# Taken from https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
-
-## General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-## Icon must end with two \r
-Icon
-
-## Thumbnails
-._*
-
-## Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-## Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Secrets.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Secrets.xcscheme
index df4102a..d5d030a 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/Secrets.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/Secrets.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -20,20 +20,6 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SecretsTests"
-               BuildableName = "SecretsTests"
-               BlueprintName = "SecretsTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -44,7 +30,9 @@
       codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "SecretsTests"
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a612ad9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/Package.resolved b/Package.resolved
index 160b8a3..8c67608 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
         "state": {
           "branch": null,
-          "revision": "e518eb6e362df327574ba5e04269cd6d29f40aec",
-          "version": "3.7.2"
+          "revision": "0188d31089b5881a269e01777be74c7316924346",
+          "version": "3.8.0"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/planetary-social/logger-ios",
         "state": {
           "branch": null,
-          "revision": "d702ccd6e95c1e3154b3206157b1cbf8ea1c7a3e",
-          "version": "0.0.2"
+          "revision": "77b1df4808a711e02e9980600cd8206e46b5af29",
+          "version": "1.0.0"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
-          "version": "1.4.2"
+          "revision": "32e8d724467f8fe623624570367e3d50c5638e46",
+          "version": "1.5.2"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index db1ae26..ce67958 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -16,20 +16,21 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
         .package(name: "Logger",
                  url: "https://github.com/planetary-social/logger-ios",
-                 from: "0.0.2")
+                 from: "1.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "Secrets",
-            dependencies: ["Logger"]),
+            dependencies: ["Logger"],
+            path: "Sources"),
         .testTarget(
             name: "SecretsTests",
             dependencies: ["Secrets"],
-            resources: [.copy("Samples/Config.plist")]),
+            path: "Tests",
+            resources: [.copy("Samples/Secrets.plist")]),
     ]
 )
diff --git a/README.md b/README.md
index 6fb7a0e..7b81ae1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,37 @@
 # Secrets
 
-A description of this package.
+** This package is part of [`Planetary`](https://github.com/planetary-social/planetary-ios). It is not intended to be used standalone.**
+
+----
+
+`Secrets` is a simple key-value storage utility to retrieve secrets in a secure way:
+
+- Store third-party service tokens and API keys
+- Retrieve them in runtime
+
+## Usage
+
+Import the `Secrets` module and use the `get` function declared in the `Keys` class. For example:
+
+```swift
+import Secrets
+
+let value = Secrets.shared.get(.posthog)
+```
+
+### The Secrets.plist file
+
+The target must have a `Secrets.plist` file in the bundle resources. It can be empty, or can contain any of the keys listed in the `Key` enum. For example:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>posthog</key>
+        <string>The posthog key here</string>
+        <key>bugsnag</key>
+        <string>The busnag key here</string>
+</dict>
+</plist>
+```
diff --git a/Sources/Delivery/Key.swift b/Sources/Delivery/Key.swift
new file mode 100644
index 0000000..4e3c63e
--- /dev/null
+++ b/Sources/Delivery/Key.swift
@@ -0,0 +1,47 @@
+//
+//  Key.swift
+//  
+//
+//  Created by Martin Dutra on 17/2/22.
+//
+
+import Foundation
+
+/// The Key enum list the possible keys that a client can use to retrieve a value
+public enum Key: String {
+    /// PostHog Project API key
+    case posthog
+
+    /// Bugsnag Notifier API key
+    case bugsnag
+
+    /// Planetary Push token
+    case push
+
+    /// Authy token
+    case authy
+
+    /// Planetary Blob token
+    case blob
+
+    /// Planetary Pub token
+    case pub
+    
+    /// Token used to authenticate with Planetary's cloud services.
+    case planetaryCloudAPISecret
+    
+    /// Token used to join the Planetary room
+    case planetaryRoomToken
+    
+    /// Token used to join the Twit room
+    case twitRoomToken
+    
+    /// Token used to join the Lorentz room
+    case lorentzRoomToken
+    
+    /// Zendesk App ID
+    case zendeskAppID
+
+    /// Zendesk Client ID
+    case zendeskClientID
+}
diff --git a/Sources/Delivery/Keys.swift b/Sources/Delivery/Keys.swift
new file mode 100644
index 0000000..c45918d
--- /dev/null
+++ b/Sources/Delivery/Keys.swift
@@ -0,0 +1,43 @@
+//
+//  Secrets.swift
+//  
+//
+//  Created by Martin Dutra on 24/11/21.
+//
+
+import Foundation
+import Logger
+
+/// The Keys class perovides a simple key-value storage (in a .plist file) utility that
+/// can be used to retrieve secrets in a secure way
+public class Keys {
+
+    /// Singleton holding a Keys instance
+    ///
+    /// This instance should be used in most cases, it prevents reading from the
+    /// Secrets.plist file each time as it maintains its value in-memory
+    public static let shared = Keys()
+
+    var service: SecretsService?
+
+    /// Creates an instance of the Keys class
+    /// - parameter bundle: Bundle instance used for finding a Secrets.plist file
+    ///
+    /// Normally, the singleton should be used instead. This initializer is useful
+    /// for testing only.
+    public init(bundle: Bundle = .main) {
+        self.service = SecretsServiceAdapter(bundle: bundle)
+    }
+
+    init(service: SecretsService) {
+        self.service = service
+    }
+
+    /// Retrieve a value associated with a given key
+    ///
+    /// - parameter key: The key whose value is going to be retrieved
+    /// - returns: The value of the key. Returns nil if it doesn't exist or the .plist file couldn't be found
+    public func get(key: Key) -> String? {
+        service?.get(key: key.rawValue)
+    }
+}
diff --git a/Sources/Secrets/Domain/Services/SecretsService.swift b/Sources/Domain/SecretsService.swift
similarity index 77%
rename from Sources/Secrets/Domain/Services/SecretsService.swift
rename to Sources/Domain/SecretsService.swift
index be4a047..3d11819 100644
--- a/Sources/Secrets/Domain/Services/SecretsService.swift
+++ b/Sources/Domain/SecretsService.swift
@@ -8,5 +8,5 @@
 import Foundation
 
 protocol SecretsService {
-    func get(key: Key) -> String?
+    func get(key: String) -> String?
 }
diff --git a/Sources/Domain/SecretsServiceAdapter.swift b/Sources/Domain/SecretsServiceAdapter.swift
new file mode 100644
index 0000000..f76b10e
--- /dev/null
+++ b/Sources/Domain/SecretsServiceAdapter.swift
@@ -0,0 +1,31 @@
+//
+//  File.swift
+//  
+//
+//  Created by Martin Dutra on 1/12/21.
+//
+
+import Foundation
+import Logger
+
+class SecretsServiceAdapter: SecretsService {
+
+    var dictionary: NSDictionary?
+
+    init(bundle: Bundle = .main) {
+        if let path = bundle.path(forResource: "Secrets", ofType: "plist") {
+            dictionary = NSDictionary(contentsOfFile: path)
+        }
+    }
+
+    func get(key: String) -> String? {
+        let value = dictionary?[key] as? String
+        if let result = value, !result.isEmpty {
+            Log.debug("Key \(key) found.")
+            return result
+        } else {
+            Log.error("Key \(key) not found.")
+            return nil
+        }
+    }
+}
diff --git a/Sources/Secrets/Delivery/Mappers/KeyMapper.swift b/Sources/Secrets/Delivery/Mappers/KeyMapper.swift
deleted file mode 100644
index 2ce4a55..0000000
--- a/Sources/Secrets/Delivery/Mappers/KeyMapper.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  KeyMapper.swift
-//  
-//
-//  Created by Martin Dutra on 8/12/21.
-//
-
-import Foundation
-
-class KeyMapper {
-    func map(key: Secrets.Key) -> Key? {
-        switch key {
-        case .posthog:
-            return Key.posthog
-        case .bugsnag:
-            return Key.bugsnag
-        case .push:
-            return Key.push
-        }
-    }
-}
diff --git a/Sources/Secrets/Delivery/Secrets.swift b/Sources/Secrets/Delivery/Secrets.swift
deleted file mode 100644
index e94de4f..0000000
--- a/Sources/Secrets/Delivery/Secrets.swift
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  Secrets.swift
-//  
-//
-//  Created by Martin Dutra on 24/11/21.
-//
-
-import Logger
-
-open class Secrets {
-
-    public enum Key {
-        case posthog
-        case bugsnag
-        case push
-    }
-    
-    public static let shared = Secrets(service: SecretsServiceAdapter(bundleSecretsService: PlistService()))
-
-    var service: SecretsService?
-
-    public init() {
-        self.service = nil
-    }
-
-    init(service: SecretsService) {
-        self.service = service
-    }
-
-    open func get(key: Secrets.Key) -> String? {
-        let mapper = KeyMapper()
-        if let key = mapper.map(key: key) {
-            return service?.get(key: key)
-        } else {
-            Logger.shared.fatal(.incorrectValue, "KeyMapper couldn't map a key")
-            return nil
-        }
-    }
-
-}
diff --git a/Sources/Secrets/Domain/Models/Key.swift b/Sources/Secrets/Domain/Models/Key.swift
deleted file mode 100644
index a3d993f..0000000
--- a/Sources/Secrets/Domain/Models/Key.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Key.swift
-//  
-//
-//  Created by Martin Dutra on 6/12/21.
-//
-
-import Foundation
-
-enum Key: String {
-    case posthog
-    case bugsnag
-    case push
-}
diff --git a/Sources/Secrets/Domain/Services/BundleSecretsService.swift b/Sources/Secrets/Domain/Services/BundleSecretsService.swift
deleted file mode 100644
index 2e49b3c..0000000
--- a/Sources/Secrets/Domain/Services/BundleSecretsService.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  BundleSecretsService.swift
-//  
-//
-//  Created by Martin Dutra on 6/12/21.
-//
-
-import Foundation
-
-protocol BundleSecretsService {
-
-    func get(key: String) -> String?
-    
-}
diff --git a/Sources/Secrets/Domain/Services/SecretsServiceAdapter.swift b/Sources/Secrets/Domain/Services/SecretsServiceAdapter.swift
deleted file mode 100644
index eb504af..0000000
--- a/Sources/Secrets/Domain/Services/SecretsServiceAdapter.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  File.swift
-//  
-//
-//  Created by Martin Dutra on 1/12/21.
-//
-
-import Foundation
-import Logger
-
-class SecretsServiceAdapter: SecretsService {
-
-    var bundleSecretsService: BundleSecretsService
-
-    init(bundleSecretsService: BundleSecretsService) {
-        self.bundleSecretsService = bundleSecretsService
-    }
-
-    func get(key: Key) -> String? {
-        if let result = bundleSecretsService.get(key: key.rawValue) {
-            Logger.shared.debug("Key \(key) found.")
-            return result
-        } else {
-            Logger.shared.info("Key \(key) not found.")
-            return nil
-        }
-    }
-
-}
diff --git a/Sources/Secrets/Infraestructure/Services/PlistService.swift b/Sources/Secrets/Infraestructure/Services/PlistService.swift
deleted file mode 100644
index 7260e19..0000000
--- a/Sources/Secrets/Infraestructure/Services/PlistService.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  PlistService.swift
-//  
-//
-//  Created by Martin Dutra on 24/11/21.
-//
-
-import Foundation
-
-class PlistService: BundleSecretsService {
-
-    var dictionary: NSDictionary?
-
-    init(bundle: Bundle = .main) {
-        if let path = bundle.path(forResource: "Config", ofType: "plist") {
-            dictionary = NSDictionary(contentsOfFile: path)
-        }
-    }
-
-    func get(key: String) -> String? {
-        return dictionary?[key] as? String
-    }
-
-}
diff --git a/Tests/SecretsTests/Delivery/SecretsTests.swift b/Tests/Delivery/KeysTests.swift
similarity index 60%
rename from Tests/SecretsTests/Delivery/SecretsTests.swift
rename to Tests/Delivery/KeysTests.swift
index 8d52e74..04a6eb6 100644
--- a/Tests/SecretsTests/Delivery/SecretsTests.swift
+++ b/Tests/Delivery/KeysTests.swift
@@ -11,11 +11,11 @@ import XCTest
 final class SecretsTests: XCTestCase {
 
     private var service: SecretsServiceMock!
-    private var secrets: Secrets!
+    private var secrets: Keys!
 
     override func setUp() {
         service = SecretsServiceMock()
-        secrets = Secrets(service: service)
+        secrets = Keys(service: service)
     }
 
     func testGet() {
@@ -24,4 +24,10 @@ final class SecretsTests: XCTestCase {
         XCTAssertEqual(secrets.get(key: .posthog), expectedValue)
     }
 
+    func testInit() {
+        secrets = Keys(bundle: .module)
+        let expectedValue = "posthog-key"
+        service.value = expectedValue
+        XCTAssertEqual(secrets.get(key: .posthog), expectedValue)
+    }
 }
diff --git a/Tests/Domain/SecretsServiceAdapterTests.swift b/Tests/Domain/SecretsServiceAdapterTests.swift
new file mode 100644
index 0000000..fe33690
--- /dev/null
+++ b/Tests/Domain/SecretsServiceAdapterTests.swift
@@ -0,0 +1,36 @@
+//
+//  SecretsServiceAdapterTests.swift
+//  
+//
+//  Created by Martin Dutra on 8/12/21.
+//
+
+import XCTest
+@testable import Secrets
+
+final class SecretsServiceAdapterTests: XCTestCase {
+
+    private var service: SecretsServiceAdapter!
+
+    override func setUp() {
+        service = SecretsServiceAdapter(bundle: .module)
+    }
+
+    func testGet() {
+        let expectedValue = "posthog-key"
+        XCTAssertEqual(service.get(key: "posthog"), expectedValue)
+    }
+
+    func testGetWhenKeyIsNotFound() {
+        XCTAssertNil(service.get(key: "unknownkey"))
+    }
+
+    func testGetWhenKeyIsFoundButEmpty() {
+        XCTAssertNil(service.get(key: "bugsnag"))
+    }
+
+    func testGetWhenPlistDoesntExist() {
+        service = SecretsServiceAdapter(bundle: .main)
+        XCTAssertNil(service.get(key: "posthog"))
+    }
+}
diff --git a/Tests/SecretsTests/Mocks/SecretsServiceMock.swift b/Tests/Mocks/SecretsServiceMock.swift
similarity index 77%
rename from Tests/SecretsTests/Mocks/SecretsServiceMock.swift
rename to Tests/Mocks/SecretsServiceMock.swift
index 8d92b4e..c82e8b8 100644
--- a/Tests/SecretsTests/Mocks/SecretsServiceMock.swift
+++ b/Tests/Mocks/SecretsServiceMock.swift
@@ -12,8 +12,7 @@ class SecretsServiceMock: SecretsService {
 
     var value: String?
 
-    func get(key: Key) -> String? {
-        return value
+    func get(key: String) -> String? {
+        value
     }
-
 }
diff --git a/Tests/SecretsTests/Samples/Config.plist b/Tests/Samples/Secrets.plist
similarity index 89%
rename from Tests/SecretsTests/Samples/Config.plist
rename to Tests/Samples/Secrets.plist
index a339d95..3dbbd52 100644
--- a/Tests/SecretsTests/Samples/Config.plist
+++ b/Tests/Samples/Secrets.plist
@@ -5,6 +5,6 @@
 	<key>posthog</key>
 	<string>posthog-key</string>
 	<key>bugsnag</key>
-	<string>bugsnag-key</string>
+	<string></string>
 </dict>
 </plist>
diff --git a/Tests/SecretsTests/Delivery/Mappers/KeyMapperTests.swift b/Tests/SecretsTests/Delivery/Mappers/KeyMapperTests.swift
deleted file mode 100644
index 1508a20..0000000
--- a/Tests/SecretsTests/Delivery/Mappers/KeyMapperTests.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  KeyMapperTests.swift
-//  
-//
-//  Created by Martin Dutra on 8/12/21.
-//
-
-import Foundation
-@testable import Secrets
-import XCTest
-
-final class KeyMapperTests: XCTestCase {
-
-    private var mapper: KeyMapper!
-
-    override func setUp() {
-        mapper = KeyMapper()
-    }
-
-    func testAllKeys() {
-        XCTAssertNotNil(mapper.map(key: .posthog))
-        XCTAssertNotNil(mapper.map(key: .bugsnag))
-        XCTAssertNotNil(mapper.map(key: .push))
-    }
-
-}
diff --git a/Tests/SecretsTests/Domain/Services/SecretsServiceAdapterTests.swift b/Tests/SecretsTests/Domain/Services/SecretsServiceAdapterTests.swift
deleted file mode 100644
index 554129c..0000000
--- a/Tests/SecretsTests/Domain/Services/SecretsServiceAdapterTests.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  SecretsServiceAdapterTests.swift
-//  
-//
-//  Created by Martin Dutra on 8/12/21.
-//
-
-import XCTest
-@testable import Secrets
-
-final class SecretsServiceAdapterTests: XCTestCase {
-
-    private var bundleSecretsService: BundleSecretsServiceMock!
-    private var service: SecretsServiceAdapter!
-
-    override func setUp() {
-        bundleSecretsService = BundleSecretsServiceMock()
-        service = SecretsServiceAdapter(bundleSecretsService: bundleSecretsService)
-    }
-
-    func testGet() {
-        let expectedValue = "tests"
-        bundleSecretsService.value = expectedValue
-        XCTAssertEqual(service.get(key: .posthog), expectedValue)
-    }
-
-    func testGetWhenKeyIsNotFound() {
-        bundleSecretsService.value = nil
-        XCTAssertNil(service.get(key: .posthog))
-    }
-
-
-}
diff --git a/Tests/SecretsTests/Infraestructure/Services/PlistServiceTests.swift b/Tests/SecretsTests/Infraestructure/Services/PlistServiceTests.swift
deleted file mode 100644
index d65bbe1..0000000
--- a/Tests/SecretsTests/Infraestructure/Services/PlistServiceTests.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  File.swift
-//  
-//
-//  Created by Martin Dutra on 6/12/21.
-//
-
-import XCTest
-@testable import Secrets
-
-final class PlistServiceTests: XCTestCase {
-
-    private var service: PlistService!
-
-    override func setUp() {
-        service = PlistService(bundle: Bundle.module)
-    }
-
-    func testGet() {
-        XCTAssertEqual(service.get(key: "posthog"), "posthog-key")
-    }
-
-    func testGetWhenKeyIsUnknown() {
-        XCTAssertNil(service.get(key: "unknownkey"))
-    }
-
-}
diff --git a/Tests/SecretsTests/Mocks/BundleSecretsServiceMock.swift b/Tests/SecretsTests/Mocks/BundleSecretsServiceMock.swift
deleted file mode 100644
index b283336..0000000
--- a/Tests/SecretsTests/Mocks/BundleSecretsServiceMock.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  BundleSecretsServiceMock.swift
-//  
-//
-//  Created by Martin Dutra on 8/12/21.
-//
-
-import Foundation
-@testable import Secrets
-
-class BundleSecretsServiceMock: BundleSecretsService {
-
-    var value: String?
-
-    func get(key: String) -> String? {
-        return value
-    }
-
-}
diff --git a/Tests/SecretsTests/Samples/.Config.plist.swp b/Tests/SecretsTests/Samples/.Config.plist.swp
deleted file mode 100644
index 3258ff9..0000000
Binary files a/Tests/SecretsTests/Samples/.Config.plist.swp and /dev/null differ