Added base classes

Forgot submodule