reorganize folder contents so they can be built by shifter