reorganized a bunch of file locations