Simplify project folder structure