Refactoring controller and template names, adding tests
line endings changed commnets removed