reorganized file locations