Refactored classes and put them to 1 module