use the proper dir structure