reorganisation of the repo and add some new stuff
merge