Change the module pathes to match the new hierarchy