Moved some classes to better packages.
Fixed display of selected item.