Cleaned up the structure of the files