need to restructure dirs so tests will run