#12 package refactoring; classess renamed according to #11; documentation dev