Reorganization of DTOs. Cleaned up some duplicate code.