Moving code around to prepare for model/view separation.
Changing project name again.. *sigh*.  Best to follow convention though.