Small directory structure change as we won't be using test cases at the moment.