updated file names for consistent structure