BIG BIG Merge

* merged all branches to 1
* common content for all branches kept at one places
* branch that had difference - subfolders created for them