change in dir structure and changes to test