change dir structure to clean up