Changed the import statements for the according to the new folder structure