changed directory structure and test cases