modularized the services and controllers into separate dirs