Refactored services dependencies

Added Module layer
Removed services dependencies from models