Major restructure to allow for services and seperation of concerns