Reorganized again for existing codebase compliance