Refactored classes into files