Update structure of app to seperate functionality into seperate modules