Move new folder layout into project