Moved primarily container classes to better packages.

Added some comments and annotations.