reorganize file locations