refactored classes
renamed paths