Replaced bnt code with submodule