Clean up and change in file structure