src/ reorganization