Some code refactoring: few classes extracted in separate files