issue #24 add new packages and divid classes into respective packages