Refactoring + reorganization