Restructuring orm for docs