Simplification of the file structure