refactor dir stucture, fix test