additional file structure, added services module
Factories updated