Fixed the file structure