Reorganized, cleaned global namespace