Refactor & clean github/repository
Adapt to interface changes