Refactoring (code organization, unnecessary files removed)