Refactor test cases directory structure