Refactor Test module directories