Removed unneeded classes.
Moved Bar.