Added some formatting and type finesse
Moved PackageSources and SecretStores to the environment level