Moved around files to more reasonable package locations.