Changed directory structure so changes are correctly tracked for next commit.