Remove obsoleted classes
Package reorganization