cleaned up the file structure