Revamp
Fixed submodule support and init conf
clean up
Clean up