Restructuring of project.
Fixed controller & service paths.