set up a new structure for the app and make it all object oriented