Simplify file structure