Reorganize
Split into MVC