Split class finalization into several files.
Rename for improved naming convention.