Moved classes into separate includes.