simplify file organization