Renamed some modules to make the file names more readable.