refactored some file locations