Cleaned up file locations