Major directory restructure to clean things up even more.