removed submodule and added manually
added testing code
updated paths