Simplify folder structure