removed non-common classes; package naming