Follow pyqode.core refactoring