refactoring folder structure
more moving stuff around
latest set of changes and refactored to use services and controllers