Housekeeping: Reorganized file locations, and improved filename consistency