added some bundles and removed some unused classes