simplify folder structure start stubbing in tests
make all the tests work