cleaned up file structure
cleaned up file structure