Minor rework to allow the new folder structure to work properly.