Updated codebase to version 2.0
Added submodule definitions
Added submodules