imported submodules; cleaned up licensing