Re-arranged file locations.