I like to refactor.

New organisation of files.