Cleaned up imports

Updated to be a level 3 section