Tied up DI modules
No longer needed Java source-dirs in cala project
Clean up packages in domain
Lump commit
Slowly shuffling around the bits to implement the deps of the domain model in android