Separated methods and classes into separate files