Renamed source files to reflect new code organization