remove test data, create correct dir hierarchy