changed quite a lot

removed dependency from git and a lot of other stuff