Changed location of import statements