Style refactor.
Renames files and fixes some code.