Restructure controllers and models and some profile and other css work