Fixed the file organization