A little more clean up. Everything should be in the right folder now.