Organized things into mvc style