Progress on refactoring

Removed imagines, JSPs, and MVC annotations.