Rearranged model layout and began to code controllers/views