Organize the code into MVCishness