Ceaning up the file structure;