Rearranging some more, adding "compiling" to combine all files back into single file for easier downloads