Refactoring and API docs generator added