REFACTOR: Move src files to services and directives directories