Change the dir structure to be able to import easily