Moved two classes into proper dir.