Refactored out parameters.
Renamed C++ files.