Code refactorized in different files