Moving resources and providers under respective packages.
Fixing formatting.