Rearraging project structure