Changing the dir structure to match the server