Clean up of file structure