Restructured the imports slightly