A little cleanup and moving files around.