Most of the refactoring has been done
Refactoring done
Update
Compiled plugin