A final refactoring to conform to psr-4
Finally staring to fix the tests