Moving up a few classes to common package.
Added more elements.