Some package refactoring - removed unused classes/files.