Refactoring part 1: moving the sources
Refactoring part 1: moving the sources