Cleaning up file structure

Cleaning up