Fixing dependencies between sub packages.
Removing inter sub package dependencies.
Forgot to commit these for testing.