Refactoring of files
Now with (some kind of) specs
Refactoring never ends