Redesign hierarchy in project's folder