Clean up structure of app, start adding image loading