changes for the new folder layout