Reorganized code - Started on Model/Controller

Time to focus on Model/Controller