Minor changes in the file structure