More cleaning of file structure