renamed directory structure so things stay in order