Separated code to different files