Refactoring and project restructuring.