Minor changes after package restructuring to ensure that all imports work.