Moved partials to their right place
Refactored controllers