refactoring test directory structure