Finish addon package refactoring