simplify file structure