Separated code into files