merging the wip work + cleaning

- no more fu*** tabs
- new @piwi github url
- clean of sources
fixing cherry-pick error