Another major restructure - re-implemented some functionality with mvc
Moved around some files