Fixed the File Structure