Convention & compilation again. Changed whitespace, renamed files. The usual.