Changed naming conventions add started using ControllerAs
Hopefully removed .swp files
Remove .swp files