re-arrange some files to places that make more sense