Continue activation refactoring & update readme