Simplify the file structure