Folder restructuring and setting up the initial PLK enums