Refactoring core and gui.