Make controller order more logical
Add some comments
Make URI-s more logical