Reorganized import statements