Setting up file structure

Cleaning up and setting up file structure