Restructured project to reflect Model/View seperation.