Refactoring

Place all the views/controllers in a package